Skip to content

dmraid: patch to fix users of dmraid when using musl#42470

Merged
dtzWill merged 1 commit intoNixOS:masterfrom
dtzWill:fix/dmraid-musl-headers
Jun 24, 2018
Merged

dmraid: patch to fix users of dmraid when using musl#42470
dtzWill merged 1 commit intoNixOS:masterfrom
dtzWill:fix/dmraid-musl-headers

Conversation

@dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 24, 2018

I hoped that setting -D_GNU_SOURCE in the build would avoid
the need for this patch -- but that only fixes the build itself,
this patch adds the define so headers work elsewhere.

Particularly, this fixes libblockdev w/musl -- before this change
it fails to "detect" headers for dmraid.h since it doesn't compile.

Follow-on to more completely fix what was started in #42198.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

I hoped that setting -D_GNU_SOURCE in the build would avoid
the need for this patch -- but that only fixes the build itself,
this patch adds the define so headers work elsewhere.

Particularly, this fixes libblockdev w/musl -- before this change
it fails to "detect" headers for dmraid.h since it doesn't compile.
@dtzWill dtzWill changed the title dmraid: patch to fix users of dmraid dmraid: patch to fix users of dmraid when using musl Jun 24, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Jun 24, 2018

Eep sorry should've been clearer with title :).

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 24, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dmraid

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: dmraid

Partial log (click to expand)

/nix/store/j8i67jnrh22k5s8yb0nvrwzlzi01dviz-dmraid-1.0.0.rc16

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dmraid

Partial log (click to expand)

these paths will be fetched (1.97 MiB download, 9.03 MiB unpacked):
  /nix/store/7xi604sbby08ca251bk3w46j3v4kab8d-lvm2-2.02.177
  /nix/store/83ikzl794c4asbs5j5r3byv1vg6qqigh-libaio-0.3.110
  /nix/store/8bfxajbb8dwsinawahvqhdjkp7ha0mvg-dmraid-1.0.0.rc16
  /nix/store/nnqhax2nj8jyhv0c9k58y4xvql5xa3za-thin-provisioning-tools-0.7.6
copying path '/nix/store/83ikzl794c4asbs5j5r3byv1vg6qqigh-libaio-0.3.110' from 'https://cache.nixos.org'...
copying path '/nix/store/nnqhax2nj8jyhv0c9k58y4xvql5xa3za-thin-provisioning-tools-0.7.6' from 'https://cache.nixos.org'...
copying path '/nix/store/7xi604sbby08ca251bk3w46j3v4kab8d-lvm2-2.02.177' from 'https://cache.nixos.org'...
copying path '/nix/store/8bfxajbb8dwsinawahvqhdjkp7ha0mvg-dmraid-1.0.0.rc16' from 'https://cache.nixos.org'...
/nix/store/8bfxajbb8dwsinawahvqhdjkp7ha0mvg-dmraid-1.0.0.rc16

@dtzWill dtzWill merged commit 99e12fc into NixOS:master Jun 24, 2018
@dtzWill dtzWill deleted the fix/dmraid-musl-headers branch June 24, 2018 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants